Don't warn when G_MAXLONG is passed as length.

2005-08-27  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn
	when G_MAXLONG is passed as length.

diff --git a/ChangeLog b/ChangeLog
index c872f2649d17fd3edaa72f6a696428acea297998..ee6a14a7b20b5a843a7c84185937292bd0386231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn
+       when G_MAXLONG is passed as length.  
+
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/updateiconcache.c: Add a separate --ignore-theme-index option

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c872f2649d17fd3edaa72f6a696428acea297998..ee6a14a7b20b5a843a7c84185937292bd0386231 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn
+       when G_MAXLONG is passed as length.  
+
 2005-08-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/updateiconcache.c: Add a separate --ignore-theme-index option

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index e1f5d77f0d5c85b98fbdb62e7f685811568d796e..8edafaa57e8551c165386cb0b8691edc19388be9 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -530,11 +530,8 @@ gdk_property_get (GdkWindow   *window,
    */
   get_length = length + 3;
   if (get_length > G_MAXLONG)
-    {
-      g_warning ("gdk_property_get(): length value has wrapped in calculation "
-                "(did you pass G_MAXLONG?)");
-      get_length = G_MAXLONG;
-    }
+    get_length = G_MAXLONG;
+
   /* To fail, either the user passed 0 or G_MAXULONG */
   get_length = get_length / 4;
   if (get_length == 0)